diff --git a/system/application/config/config.php b/system/application/config/config.php
index 3b2ca4a..a02fed1 100644
--- a/system/application/config/config.php
+++ b/system/application/config/config.php
@@ -51,7 +51,7 @@
 | This option allows you to add a suffix to all URLs generated by CodeIgniter.
 | For more information please see the user guide:
 |
-| http://www.codeigniter.com/user_guide/general/urls.html
+| http://codeigniter.com/user_guide/general/urls.html
 */
 
 $config['url_suffix'] = "";
@@ -99,8 +99,8 @@
 | This item allows you to set the filename/classname prefix when extending
 | native libraries.  For more information please see the user guide:
 |
-| http://www.codeigniter.com/user_guide/general/core_classes.html
-| http://www.codeigniter.com/user_guide/general/creating_libraries.html
+| http://codeigniter.com/user_guide/general/core_classes.html
+| http://codeigniter.com/user_guide/general/creating_libraries.html
 |
 */
 $config['subclass_prefix'] = 'MY_';
diff --git a/system/application/config/hooks.php b/system/application/config/hooks.php
index 95e74cb..f0a0d6e 100644
--- a/system/application/config/hooks.php
+++ b/system/application/config/hooks.php
@@ -6,7 +6,7 @@
 | This file lets you define "hooks" to extend CI without hacking the core
 | files.  Please see the user guide for info:
 |
-|	http://www.codeigniter.com/user_guide/general/hooks.html
+|	http://codeigniter.com/user_guide/general/hooks.html
 |
 */
 
diff --git a/system/application/config/routes.php b/system/application/config/routes.php
index be09f5a..1395b7a 100644
--- a/system/application/config/routes.php
+++ b/system/application/config/routes.php
@@ -17,7 +17,7 @@
 |
 | Please see the user guide for complete details:
 |
-|	http://www.codeigniter.com/user_guide/general/routing.html
+|	http://codeigniter.com/user_guide/general/routing.html
 |
 | -------------------------------------------------------------------------
 | RESERVED ROUTES
diff --git a/system/application/config/smileys.php b/system/application/config/smileys.php
index 2a0d689..a227d8b 100644
--- a/system/application/config/smileys.php
+++ b/system/application/config/smileys.php
@@ -8,7 +8,7 @@
 | :-) and :) use the same image replacement.
 |
 | Please see user guide for more info: 
-| http://www.codeigniter.com/user_guide/helpers/smiley_helper.html
+| http://codeigniter.com/user_guide/helpers/smiley_helper.html
 |
 */
 
diff --git a/system/codeigniter/Base4.php b/system/codeigniter/Base4.php
index 4d276f4..577977c 100644
--- a/system/codeigniter/Base4.php
+++ b/system/codeigniter/Base4.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.3
  * @filesource
  */
@@ -36,7 +36,7 @@
  * @subpackage	codeigniter
  * @category	front-controller
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/
+ * @link		http://codeigniter.com/user_guide/
  */
  class CI_Base extends CI_Loader {
 
diff --git a/system/codeigniter/Base5.php b/system/codeigniter/Base5.php
index 9b59197..c731a00 100644
--- a/system/codeigniter/Base5.php
+++ b/system/codeigniter/Base5.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.3
  * @filesource
  */
@@ -27,7 +27,7 @@
  * @subpackage	codeigniter
  * @category	front-controller
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/
+ * @link		http://codeigniter.com/user_guide/
  */
 
 class CI_Base {
diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php
index 0797386..7556f48 100644
--- a/system/codeigniter/CodeIgniter.php
+++ b/system/codeigniter/CodeIgniter.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -24,7 +24,7 @@
  * @subpackage	codeigniter
  * @category	Front-controller
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/
+ * @link		http://codeigniter.com/user_guide/
  */
 
 // CI Version
diff --git a/system/codeigniter/Common.php b/system/codeigniter/Common.php
index 327702f..b6f0a46 100644
--- a/system/codeigniter/Common.php
+++ b/system/codeigniter/Common.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -24,7 +24,7 @@
  * @subpackage	codeigniter
  * @category	Common Functions
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/
+ * @link		http://codeigniter.com/user_guide/
  */
 
 // ------------------------------------------------------------------------
diff --git a/system/codeigniter/Compat.php b/system/codeigniter/Compat.php
index 357eb53..56ebbf4 100644
--- a/system/codeigniter/Compat.php
+++ b/system/codeigniter/Compat.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -25,7 +25,7 @@
  * @subpackage	codeigniter
  * @category	Compatibility Functions
  * @author		ExpressionEngine Development Team
- * @link		http://www.codeigniter.com/user_guide/
+ * @link		http://codeigniter.com/user_guide/
  */
 
 // ------------------------------------------------------------------------
diff --git a/system/database/DB.php b/system/database/DB.php
index b059e76..abd782c 100644
--- a/system/database/DB.php
+++ b/system/database/DB.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -20,7 +20,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 function &DB($params = '', $active_record = FALSE)
 {
diff --git a/system/database/DB_active_rec.php b/system/database/DB_active_rec.php
index ace2a27..08213af 100644
--- a/system/database/DB_active_rec.php
+++ b/system/database/DB_active_rec.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -24,7 +24,7 @@
  * @subpackage	Drivers
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_active_record extends CI_DB_driver {
 
diff --git a/system/database/DB_cache.php b/system/database/DB_cache.php
index ac297ac..44b8e81 100644
--- a/system/database/DB_cache.php
+++ b/system/database/DB_cache.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -20,7 +20,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_Cache {
 
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index bffdfc6..65be13d 100644
--- a/system/database/DB_driver.php
+++ b/system/database/DB_driver.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -26,7 +26,7 @@
  * @subpackage	Drivers
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_driver {
 
diff --git a/system/database/DB_forge.php b/system/database/DB_forge.php
index f8b74c0..7febb72 100644
--- a/system/database/DB_forge.php
+++ b/system/database/DB_forge.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -20,7 +20,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_forge {
 
diff --git a/system/database/DB_result.php b/system/database/DB_result.php
index 7b5b384..7d50979 100644
--- a/system/database/DB_result.php
+++ b/system/database/DB_result.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -24,7 +24,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_result {
 
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index 513664b..9b78aa8 100644
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -20,7 +20,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_utility extends CI_DB_forge {
 
diff --git a/system/database/drivers/mssql/mssql_driver.php b/system/database/drivers/mssql/mssql_driver.php
index 6b453ab..e0c4db7 100644
--- a/system/database/drivers/mssql/mssql_driver.php
+++ b/system/database/drivers/mssql/mssql_driver.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -26,7 +26,7 @@
  * @subpackage	Drivers
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_mssql_driver extends CI_DB {
 
diff --git a/system/database/drivers/mssql/mssql_forge.php b/system/database/drivers/mssql/mssql_forge.php
index eda308f..baf776c 100644
--- a/system/database/drivers/mssql/mssql_forge.php
+++ b/system/database/drivers/mssql/mssql_forge.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -20,7 +20,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_mssql_forge extends CI_DB_forge {
 
diff --git a/system/database/drivers/mssql/mssql_result.php b/system/database/drivers/mssql/mssql_result.php
index ca3ca4b..c95fd91 100644
--- a/system/database/drivers/mssql/mssql_result.php
+++ b/system/database/drivers/mssql/mssql_result.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_mssql_result extends CI_DB_result {
 	
diff --git a/system/database/drivers/mssql/mssql_utility.php b/system/database/drivers/mssql/mssql_utility.php
index 0852712..87f8196 100644
--- a/system/database/drivers/mssql/mssql_utility.php
+++ b/system/database/drivers/mssql/mssql_utility.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -20,7 +20,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_mssql_utility extends CI_DB_utility {
 
diff --git a/system/database/drivers/mysql/mysql_driver.php b/system/database/drivers/mysql/mysql_driver.php
index e876deb..6e53537 100644
--- a/system/database/drivers/mysql/mysql_driver.php
+++ b/system/database/drivers/mysql/mysql_driver.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -26,7 +26,7 @@
  * @subpackage	Drivers
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_mysql_driver extends CI_DB {
 
diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php
index 71327f5..6e3a2d1 100644
--- a/system/database/drivers/mysql/mysql_forge.php
+++ b/system/database/drivers/mysql/mysql_forge.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -20,7 +20,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_mysql_forge extends CI_DB_forge {
 	
diff --git a/system/database/drivers/mysql/mysql_result.php b/system/database/drivers/mysql/mysql_result.php
index bfbac29..9e6a3c3 100644
--- a/system/database/drivers/mysql/mysql_result.php
+++ b/system/database/drivers/mysql/mysql_result.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_mysql_result extends CI_DB_result {
 
diff --git a/system/database/drivers/mysql/mysql_utility.php b/system/database/drivers/mysql/mysql_utility.php
index 38feaaf..dc8fd08 100644
--- a/system/database/drivers/mysql/mysql_utility.php
+++ b/system/database/drivers/mysql/mysql_utility.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -20,7 +20,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_mysql_utility extends CI_DB_utility {
 
diff --git a/system/database/drivers/mysqli/mysqli_driver.php b/system/database/drivers/mysqli/mysqli_driver.php
index bfdabe1..d645cc8 100644
--- a/system/database/drivers/mysqli/mysqli_driver.php
+++ b/system/database/drivers/mysqli/mysqli_driver.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -26,7 +26,7 @@
  * @subpackage	Drivers
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_mysqli_driver extends CI_DB {
 
diff --git a/system/database/drivers/mysqli/mysqli_forge.php b/system/database/drivers/mysqli/mysqli_forge.php
index 388c665..cb315a4 100644
--- a/system/database/drivers/mysqli/mysqli_forge.php
+++ b/system/database/drivers/mysqli/mysqli_forge.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -20,7 +20,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_mysqli_forge extends CI_DB_forge {
 	
diff --git a/system/database/drivers/mysqli/mysqli_result.php b/system/database/drivers/mysqli/mysqli_result.php
index 6861da7..586c292 100644
--- a/system/database/drivers/mysqli/mysqli_result.php
+++ b/system/database/drivers/mysqli/mysqli_result.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_mysqli_result extends CI_DB_result {
 	
diff --git a/system/database/drivers/mysqli/mysqli_utility.php b/system/database/drivers/mysqli/mysqli_utility.php
index 2aa5ecc..bb1f6f9 100644
--- a/system/database/drivers/mysqli/mysqli_utility.php
+++ b/system/database/drivers/mysqli/mysqli_utility.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -20,7 +20,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_mysqli_utility extends CI_DB_utility {
 	
diff --git a/system/database/drivers/oci8/oci8_driver.php b/system/database/drivers/oci8/oci8_driver.php
index 820501c..bc0862b 100644
--- a/system/database/drivers/oci8/oci8_driver.php
+++ b/system/database/drivers/oci8/oci8_driver.php
@@ -7,8 +7,8 @@
  * @package	 	CodeIgniter
  * @author	  	ExpressionEngine Dev Team
  * @copyright   Copyright (c) 2006, EllisLab, Inc.
- * @license	 	http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license	 	http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since	   	Version 1.0
  * @filesource
  */
@@ -26,7 +26,7 @@
  * @subpackage  Drivers
  * @category	Database
  * @author	  	ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 
 /**
diff --git a/system/database/drivers/oci8/oci8_forge.php b/system/database/drivers/oci8/oci8_forge.php
index 57f2885..b9d9e63 100644
--- a/system/database/drivers/oci8/oci8_forge.php
+++ b/system/database/drivers/oci8/oci8_forge.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -20,7 +20,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_oci8_forge extends CI_DB_forge {
 
diff --git a/system/database/drivers/oci8/oci8_result.php b/system/database/drivers/oci8/oci8_result.php
index b1a703b..30dd0da 100644
--- a/system/database/drivers/oci8/oci8_result.php
+++ b/system/database/drivers/oci8/oci8_result.php
@@ -7,8 +7,8 @@
  * @package	 	CodeIgniter
  * @author	 	ExpressionEngine Dev Team
  * @copyright   Copyright (c) 2006, EllisLab, Inc.
- * @license	 	http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license	 	http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since	   	Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  *
  * @category	Database
  * @author	 	ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_oci8_result extends CI_DB_result {
 
diff --git a/system/database/drivers/oci8/oci8_utility.php b/system/database/drivers/oci8/oci8_utility.php
index 6b53a4f..117f8e6 100644
--- a/system/database/drivers/oci8/oci8_utility.php
+++ b/system/database/drivers/oci8/oci8_utility.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -20,7 +20,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_oci8_utility extends CI_DB_utility {
 
diff --git a/system/database/drivers/odbc/odbc_driver.php b/system/database/drivers/odbc/odbc_driver.php
index c4a3df1..daecabe 100644
--- a/system/database/drivers/odbc/odbc_driver.php
+++ b/system/database/drivers/odbc/odbc_driver.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -26,7 +26,7 @@
  * @subpackage	Drivers
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_odbc_driver extends CI_DB {
 
diff --git a/system/database/drivers/odbc/odbc_forge.php b/system/database/drivers/odbc/odbc_forge.php
index 455cb0f..374c15f 100644
--- a/system/database/drivers/odbc/odbc_forge.php
+++ b/system/database/drivers/odbc/odbc_forge.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -20,7 +20,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/database/
+ * @link		http://codeigniter.com/database/
  */
 class CI_DB_odbc_forge extends CI_DB_forge {
 
diff --git a/system/database/drivers/odbc/odbc_result.php b/system/database/drivers/odbc/odbc_result.php
index c818c33..dd3f923 100644
--- a/system/database/drivers/odbc/odbc_result.php
+++ b/system/database/drivers/odbc/odbc_result.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_odbc_result extends CI_DB_result {
 	
diff --git a/system/database/drivers/odbc/odbc_utility.php b/system/database/drivers/odbc/odbc_utility.php
index 561a6e4..f74d031 100644
--- a/system/database/drivers/odbc/odbc_utility.php
+++ b/system/database/drivers/odbc/odbc_utility.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -20,7 +20,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/database/
+ * @link		http://codeigniter.com/database/
  */
 class CI_DB_odbc_utility extends CI_DB_utility {
 
diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index 5bf87c5..34d76de 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -26,7 +26,7 @@
  * @subpackage	Drivers
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_postgre_driver extends CI_DB {
 
diff --git a/system/database/drivers/postgre/postgre_forge.php b/system/database/drivers/postgre/postgre_forge.php
index e3d6a8f..81ac8e9 100644
--- a/system/database/drivers/postgre/postgre_forge.php
+++ b/system/database/drivers/postgre/postgre_forge.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -20,7 +20,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_postgre_forge extends CI_DB_forge {
 
diff --git a/system/database/drivers/postgre/postgre_result.php b/system/database/drivers/postgre/postgre_result.php
index d09e573..fdce01a 100644
--- a/system/database/drivers/postgre/postgre_result.php
+++ b/system/database/drivers/postgre/postgre_result.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_postgre_result extends CI_DB_result {
 
diff --git a/system/database/drivers/postgre/postgre_utility.php b/system/database/drivers/postgre/postgre_utility.php
index 240e1b7..573654f 100644
--- a/system/database/drivers/postgre/postgre_utility.php
+++ b/system/database/drivers/postgre/postgre_utility.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -20,7 +20,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_postgre_utility extends CI_DB_utility {
 
diff --git a/system/database/drivers/sqlite/sqlite_driver.php b/system/database/drivers/sqlite/sqlite_driver.php
index 60289c7..9cc69bb 100644
--- a/system/database/drivers/sqlite/sqlite_driver.php
+++ b/system/database/drivers/sqlite/sqlite_driver.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -28,7 +28,7 @@
  * @subpackage	Drivers
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_sqlite_driver extends CI_DB {
 
diff --git a/system/database/drivers/sqlite/sqlite_forge.php b/system/database/drivers/sqlite/sqlite_forge.php
index efc94fb..e3196cc 100644
--- a/system/database/drivers/sqlite/sqlite_forge.php
+++ b/system/database/drivers/sqlite/sqlite_forge.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -20,7 +20,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_sqlite_forge extends CI_DB_forge {
 
diff --git a/system/database/drivers/sqlite/sqlite_result.php b/system/database/drivers/sqlite/sqlite_result.php
index 859b65f..b8f3dc5 100644
--- a/system/database/drivers/sqlite/sqlite_result.php
+++ b/system/database/drivers/sqlite/sqlite_result.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_sqlite_result extends CI_DB_result {
 	
diff --git a/system/database/drivers/sqlite/sqlite_utility.php b/system/database/drivers/sqlite/sqlite_utility.php
index c2f8b9b..d1e1fe0 100644
--- a/system/database/drivers/sqlite/sqlite_utility.php
+++ b/system/database/drivers/sqlite/sqlite_utility.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -20,7 +20,7 @@
  *
  * @category	Database
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/database/
+ * @link		http://codeigniter.com/user_guide/database/
  */
 class CI_DB_sqlite_utility extends CI_DB_utility {
 
diff --git a/system/helpers/array_helper.php b/system/helpers/array_helper.php
index d559adf..85d0379 100644
--- a/system/helpers/array_helper.php
+++ b/system/helpers/array_helper.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/array_helper.html
+ * @link		http://codeigniter.com/user_guide/helpers/array_helper.html
  */
 
 // ------------------------------------------------------------------------
diff --git a/system/helpers/cookie_helper.php b/system/helpers/cookie_helper.php
index c1469a9..2a4a963 100644
--- a/system/helpers/cookie_helper.php
+++ b/system/helpers/cookie_helper.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/cookie_helper.html
+ * @link		http://codeigniter.com/user_guide/helpers/cookie_helper.html
  */
 
 // ------------------------------------------------------------------------
diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php
index 7213c3a..9f4c66b 100644
--- a/system/helpers/date_helper.php
+++ b/system/helpers/date_helper.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/date_helper.html
+ * @link		http://codeigniter.com/user_guide/helpers/date_helper.html
  */
 
 // ------------------------------------------------------------------------
diff --git a/system/helpers/directory_helper.php b/system/helpers/directory_helper.php
index 273c8ee..4a499de 100644
--- a/system/helpers/directory_helper.php
+++ b/system/helpers/directory_helper.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/directory_helper.html
+ * @link		http://codeigniter.com/user_guide/helpers/directory_helper.html
  */
 
 // ------------------------------------------------------------------------
diff --git a/system/helpers/download_helper.php b/system/helpers/download_helper.php
index ece22d9..e8bc2f7 100644
--- a/system/helpers/download_helper.php
+++ b/system/helpers/download_helper.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/download_helper.html
+ * @link		http://codeigniter.com/user_guide/helpers/download_helper.html
  */
 
 // ------------------------------------------------------------------------
diff --git a/system/helpers/email_helper.php b/system/helpers/email_helper.php
index 3729e04..b44fae5 100644
--- a/system/helpers/email_helper.php
+++ b/system/helpers/email_helper.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/email_helper.html
+ * @link		http://codeigniter.com/user_guide/helpers/email_helper.html
  */
 
 // ------------------------------------------------------------------------
diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php
index ebf30e9..a5dc437 100644
--- a/system/helpers/file_helper.php
+++ b/system/helpers/file_helper.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/file_helpers.html
+ * @link		http://codeigniter.com/user_guide/helpers/file_helpers.html
  */
 
 // ------------------------------------------------------------------------
diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index 5c14570..a2bc200 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/form_helper.html
+ * @link		http://codeigniter.com/user_guide/helpers/form_helper.html
  */
 
 // ------------------------------------------------------------------------
diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php
index 07757c2..a11d23e 100644
--- a/system/helpers/html_helper.php
+++ b/system/helpers/html_helper.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/html_helper.html
+ * @link		http://codeigniter.com/user_guide/helpers/html_helper.html
  */
 
 // ------------------------------------------------------------------------
diff --git a/system/helpers/inflector_helper.php b/system/helpers/inflector_helper.php
index a72d0ce..b1864cb 100644
--- a/system/helpers/inflector_helper.php
+++ b/system/helpers/inflector_helper.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/directory_helper.html
+ * @link		http://codeigniter.com/user_guide/helpers/directory_helper.html
  */
 
 
diff --git a/system/helpers/security_helper.php b/system/helpers/security_helper.php
index 44c6811..97c9a6b 100644
--- a/system/helpers/security_helper.php
+++ b/system/helpers/security_helper.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/security_helper.html
+ * @link		http://codeigniter.com/user_guide/helpers/security_helper.html
  */
 
 // ------------------------------------------------------------------------
diff --git a/system/helpers/smiley_helper.php b/system/helpers/smiley_helper.php
index 58ed20e..d61ea78 100644
--- a/system/helpers/smiley_helper.php
+++ b/system/helpers/smiley_helper.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/smiley_helper.html
+ * @link		http://codeigniter.com/user_guide/helpers/smiley_helper.html
  */
 
 // ------------------------------------------------------------------------
diff --git a/system/helpers/string_helper.php b/system/helpers/string_helper.php
index ff7dc0a..42bcd57 100644
--- a/system/helpers/string_helper.php
+++ b/system/helpers/string_helper.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/string_helper.html
+ * @link		http://codeigniter.com/user_guide/helpers/string_helper.html
  */
 
 // ------------------------------------------------------------------------
diff --git a/system/helpers/text_helper.php b/system/helpers/text_helper.php
index 211ef10..9620e03 100644
--- a/system/helpers/text_helper.php
+++ b/system/helpers/text_helper.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/text_helper.html
+ * @link		http://codeigniter.com/user_guide/helpers/text_helper.html
  */
 
 // ------------------------------------------------------------------------
diff --git a/system/helpers/typography_helper.php b/system/helpers/typography_helper.php
index 93a887d..4a746c6 100644
--- a/system/helpers/typography_helper.php
+++ b/system/helpers/typography_helper.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/typography_helper.html
+ * @link		http://codeigniter.com/user_guide/helpers/typography_helper.html
  */
 
 // ------------------------------------------------------------------------
@@ -83,7 +83,7 @@
  * @access		private
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/
+ * @link		http://codeigniter.com/user_guide/helpers/
  */
 class Auto_typography {
 
diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php
index 39ef484..9969af0 100644
--- a/system/helpers/url_helper.php
+++ b/system/helpers/url_helper.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/url_helper.html
+ * @link		http://codeigniter.com/user_guide/helpers/url_helper.html
  */
 
 // ------------------------------------------------------------------------
diff --git a/system/helpers/xml_helper.php b/system/helpers/xml_helper.php
index 8c39a75..1a2c737 100644
--- a/system/helpers/xml_helper.php
+++ b/system/helpers/xml_helper.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Helpers
  * @category	Helpers
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/helpers/xml_helper.html
+ * @link		http://codeigniter.com/user_guide/helpers/xml_helper.html
  */
 
 // ------------------------------------------------------------------------
diff --git a/system/libraries/Benchmark.php b/system/libraries/Benchmark.php
index 88ef95c..bca3782 100644
--- a/system/libraries/Benchmark.php
+++ b/system/libraries/Benchmark.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -25,7 +25,7 @@
  * @subpackage	Libraries
  * @category	Libraries
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/benchmark.html
+ * @link		http://codeigniter.com/user_guide/libraries/benchmark.html
  */
 class CI_Benchmark {
 
diff --git a/system/libraries/Calendar.php b/system/libraries/Calendar.php
index 5aa3cb6..a85c183 100644
--- a/system/libraries/Calendar.php
+++ b/system/libraries/Calendar.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -24,7 +24,7 @@
  * @subpackage	Libraries
  * @category	Libraries
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/calendar.html
+ * @link		http://codeigniter.com/user_guide/libraries/calendar.html
  */
 class CI_Calendar {
 
diff --git a/system/libraries/Config.php b/system/libraries/Config.php
index 92c60b4..9b8b07c 100644
--- a/system/libraries/Config.php
+++ b/system/libraries/Config.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -24,7 +24,7 @@
  * @subpackage	Libraries
  * @category	Libraries
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/config.html
+ * @link		http://codeigniter.com/user_guide/libraries/config.html
  */
 class CI_Config {
 
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index d515bed..ad9c668 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -25,7 +25,7 @@
  * @subpackage	Libraries
  * @category	Libraries
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/general/controllers.html
+ * @link		http://codeigniter.com/user_guide/general/controllers.html
  */
 class Controller extends CI_Base {
 
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 77e5bf5..6136a05 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -24,7 +24,7 @@
  * @subpackage	Libraries
  * @category	Libraries
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/email.html
+ * @link		http://codeigniter.com/user_guide/libraries/email.html
  */
 class CI_Email {
 
diff --git a/system/libraries/Encrypt.php b/system/libraries/Encrypt.php
index ccc470c..b533c04 100644
--- a/system/libraries/Encrypt.php
+++ b/system/libraries/Encrypt.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -24,7 +24,7 @@
  * @subpackage	Libraries
  * @category	Libraries
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/encryption.html
+ * @link		http://codeigniter.com/user_guide/libraries/encryption.html
  */
 class CI_Encrypt {
 
diff --git a/system/libraries/Exceptions.php b/system/libraries/Exceptions.php
index 9223ff2..b22ef9f 100644
--- a/system/libraries/Exceptions.php
+++ b/system/libraries/Exceptions.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Libraries
  * @category	Exceptions
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/exceptions.html
+ * @link		http://codeigniter.com/user_guide/libraries/exceptions.html
  */
 class CI_Exceptions {
 	var $action;
diff --git a/system/libraries/Ftp.php b/system/libraries/Ftp.php
index 77a982f..9fdee01 100644
--- a/system/libraries/Ftp.php
+++ b/system/libraries/Ftp.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Libraries
  * @category	Libraries
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/ftp.html
+ * @link		http://codeigniter.com/user_guide/libraries/ftp.html
  */ 
 class CI_FTP {
 
diff --git a/system/libraries/Hooks.php b/system/libraries/Hooks.php
index 04cdd0a..49cb230 100644
--- a/system/libraries/Hooks.php
+++ b/system/libraries/Hooks.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -25,7 +25,7 @@
  * @subpackage	Libraries
  * @category	Libraries
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/encryption.html
+ * @link		http://codeigniter.com/user_guide/libraries/encryption.html
  */
 class CI_Hooks {
 	
diff --git a/system/libraries/Image_lib.php b/system/libraries/Image_lib.php
index f563ada..9a78adf 100644
--- a/system/libraries/Image_lib.php
+++ b/system/libraries/Image_lib.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Libraries
  * @category	Image_lib
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/image_lib.html
+ * @link		http://codeigniter.com/user_guide/libraries/image_lib.html
  */
 class CI_Image_lib {
 	
diff --git a/system/libraries/Input.php b/system/libraries/Input.php
index 4044024..de70738 100644
--- a/system/libraries/Input.php
+++ b/system/libraries/Input.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -24,7 +24,7 @@
  * @subpackage	Libraries
  * @category	Input
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/input.html
+ * @link		http://codeigniter.com/user_guide/libraries/input.html
  */
 class CI_Input {
 	var $use_xss_clean		= FALSE;
diff --git a/system/libraries/Language.php b/system/libraries/Language.php
index 40816f9..3dac1a6 100644
--- a/system/libraries/Language.php
+++ b/system/libraries/Language.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Libraries
  * @category	Language
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/language.html
+ * @link		http://codeigniter.com/user_guide/libraries/language.html
  */
 class CI_Language {
 
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index d2f5702..e2420a0 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -24,7 +24,7 @@
  * @subpackage	Libraries
  * @author		ExpressionEngine Dev Team
  * @category	Loader
- * @link		http://www.codeigniter.com/user_guide/libraries/loader.html
+ * @link		http://codeigniter.com/user_guide/libraries/loader.html
  */
 class CI_Loader {
 
diff --git a/system/libraries/Log.php b/system/libraries/Log.php
index 2218add..011bdbf 100644
--- a/system/libraries/Log.php
+++ b/system/libraries/Log.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Libraries
  * @category	Logging
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/general/errors.html
+ * @link		http://codeigniter.com/user_guide/general/errors.html
  */
 class CI_Log {
 
diff --git a/system/libraries/Model.php b/system/libraries/Model.php
index bfadd9a..8181ead 100644
--- a/system/libraries/Model.php
+++ b/system/libraries/Model.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Libraries
  * @category	Libraries
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/config.html
+ * @link		http://codeigniter.com/user_guide/libraries/config.html
  */
 class Model {
 
diff --git a/system/libraries/Output.php b/system/libraries/Output.php
index 14640d8..ed9f6f4 100644
--- a/system/libraries/Output.php
+++ b/system/libraries/Output.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -24,7 +24,7 @@
  * @subpackage	Libraries
  * @category	Output
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/output.html
+ * @link		http://codeigniter.com/user_guide/libraries/output.html
  */
 class CI_Output {
 
diff --git a/system/libraries/Pagination.php b/system/libraries/Pagination.php
index 8c05736..ba1572f 100644
--- a/system/libraries/Pagination.php
+++ b/system/libraries/Pagination.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Libraries
  * @category	Pagination
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/pagination.html
+ * @link		http://codeigniter.com/user_guide/libraries/pagination.html
  */
 class CI_Pagination {
 
diff --git a/system/libraries/Parser.php b/system/libraries/Parser.php
index 8e4d604..a0b310f 100644
--- a/system/libraries/Parser.php
+++ b/system/libraries/Parser.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Libraries
  * @category	Parser
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/parser.html
+ * @link		http://codeigniter.com/user_guide/libraries/parser.html
  */
 class CI_Parser {
 
diff --git a/system/libraries/Profiler.php b/system/libraries/Profiler.php
index 65d62f2..3b18902 100644
--- a/system/libraries/Profiler.php
+++ b/system/libraries/Profiler.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -28,7 +28,7 @@
  * @subpackage	Libraries
  * @category	Libraries
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/general/profiling.html
+ * @link		http://codeigniter.com/user_guide/general/profiling.html
  */
 class CI_Profiler {
 
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index 685426a..df72cea 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -24,7 +24,7 @@
  * @subpackage	Libraries
  * @author		ExpressionEngine Dev Team
  * @category	Libraries
- * @link		http://www.codeigniter.com/user_guide/general/routing.html
+ * @link		http://codeigniter.com/user_guide/general/routing.html
  */
 class CI_Router {
 
diff --git a/system/libraries/Session.php b/system/libraries/Session.php
index 5bc17f1..a92db0e 100644
--- a/system/libraries/Session.php
+++ b/system/libraries/Session.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Libraries
  * @category	Sessions
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/sessions.html
+ * @link		http://codeigniter.com/user_guide/libraries/sessions.html
  */
 class CI_Session {
 
diff --git a/system/libraries/Sha1.php b/system/libraries/Sha1.php
index e9b724b..6bb8911 100644
--- a/system/libraries/Sha1.php
+++ b/system/libraries/Sha1.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -40,7 +40,7 @@
  * @subpackage	Libraries
  * @category	Encryption
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/general/encryption.html
+ * @link		http://codeigniter.com/user_guide/general/encryption.html
  */
 class CI_SHA {
 
diff --git a/system/libraries/Table.php b/system/libraries/Table.php
index f67b17e..d1c5254 100644
--- a/system/libraries/Table.php
+++ b/system/libraries/Table.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.3.1
  * @filesource
  */
@@ -24,7 +24,7 @@
  * @subpackage	Libraries
  * @category	HTML Tables
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/uri.html
+ * @link		http://codeigniter.com/user_guide/libraries/uri.html
  */
 class CI_Table {
 
diff --git a/system/libraries/Trackback.php b/system/libraries/Trackback.php
index d325b7e..5371e90 100644
--- a/system/libraries/Trackback.php
+++ b/system/libraries/Trackback.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -24,7 +24,7 @@
  * @subpackage	Libraries
  * @category	Trackbacks
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/trackback.html
+ * @link		http://codeigniter.com/user_guide/libraries/trackback.html
  */
 class CI_Trackback {
 		
diff --git a/system/libraries/URI.php b/system/libraries/URI.php
index 5aafbb4..1349ebe 100644
--- a/system/libraries/URI.php
+++ b/system/libraries/URI.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -24,7 +24,7 @@
  * @subpackage	Libraries
  * @category	URI
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/uri.html
+ * @link		http://codeigniter.com/user_guide/libraries/uri.html
  */
 class CI_URI {
 
diff --git a/system/libraries/Unit_test.php b/system/libraries/Unit_test.php
index 4bf32d6..33a8f31 100644
--- a/system/libraries/Unit_test.php
+++ b/system/libraries/Unit_test.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.3.1
  * @filesource
  */
@@ -24,7 +24,7 @@
  * @subpackage	Libraries
  * @category	UnitTesting
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/uri.html
+ * @link		http://codeigniter.com/user_guide/libraries/uri.html
  */
 class CI_Unit_test {
 
diff --git a/system/libraries/Upload.php b/system/libraries/Upload.php
index 387f725..6511c68 100644
--- a/system/libraries/Upload.php
+++ b/system/libraries/Upload.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Libraries
  * @category	Uploads
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/file_uploading.html
+ * @link		http://codeigniter.com/user_guide/libraries/file_uploading.html
  */
 class CI_Upload {
 	
diff --git a/system/libraries/User_agent.php b/system/libraries/User_agent.php
index 7670d7b..9fa45c8 100644
--- a/system/libraries/User_agent.php
+++ b/system/libraries/User_agent.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -24,7 +24,7 @@
  * @subpackage	Libraries
  * @category	User Agent
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/user_agent.html
+ * @link		http://codeigniter.com/user_guide/libraries/user_agent.html
  */
 class CI_User_agent {
 
diff --git a/system/libraries/Validation.php b/system/libraries/Validation.php
index 061cacc..d96b4f6 100644
--- a/system/libraries/Validation.php
+++ b/system/libraries/Validation.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -22,7 +22,7 @@
  * @subpackage	Libraries
  * @category	Validation
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/validation.html
+ * @link		http://codeigniter.com/user_guide/libraries/validation.html
  */
 class CI_Validation {
 	
diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php
index 4426ff4..9eb3293 100644
--- a/system/libraries/Xmlrpc.php
+++ b/system/libraries/Xmlrpc.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -28,7 +28,7 @@
  * @subpackage	Libraries
  * @category	XML-RPC
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/xmlrpc.html
+ * @link		http://codeigniter.com/user_guide/libraries/xmlrpc.html
  */
 class CI_Xmlrpc {
 
@@ -338,7 +338,7 @@
  *
  * @category	XML-RPC
  * @author		ExpressionEngine Dev Team 
- * @link		http://www.codeigniter.com/user_guide/libraries/xmlrpc.html
+ * @link		http://codeigniter.com/user_guide/libraries/xmlrpc.html
  */
 class XML_RPC_Client extends CI_Xmlrpc
 {
@@ -416,7 +416,7 @@
  *
  * @category	XML-RPC
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/xmlrpc.html
+ * @link		http://codeigniter.com/user_guide/libraries/xmlrpc.html
  */
 class XML_RPC_Response
 {
@@ -596,7 +596,7 @@
  *
  * @category	XML-RPC
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/xmlrpc.html
+ * @link		http://codeigniter.com/user_guide/libraries/xmlrpc.html
  */
 class XML_RPC_Message extends CI_Xmlrpc
 {
@@ -1193,7 +1193,7 @@
  *
  * @category	XML-RPC
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/xmlrpc.html
+ * @link		http://codeigniter.com/user_guide/libraries/xmlrpc.html
  */
 class XML_RPC_Values extends CI_Xmlrpc
 {
diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php
index 6854c8c..59ac585 100644
--- a/system/libraries/Xmlrpcs.php
+++ b/system/libraries/Xmlrpcs.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -32,7 +32,7 @@
  * @subpackage	Libraries
  * @category	XML-RPC
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/xmlrpc.html
+ * @link		http://codeigniter.com/user_guide/libraries/xmlrpc.html
  */
 class CI_Xmlrpcs extends CI_Xmlrpc
 {
diff --git a/system/libraries/Zip.php b/system/libraries/Zip.php
index da40f8d..a3d42f3 100644
--- a/system/libraries/Zip.php
+++ b/system/libraries/Zip.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -28,7 +28,7 @@
  * @subpackage	Libraries
  * @category	Encryption
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/libraries/zip.html
+ * @link		http://codeigniter.com/user_guide/libraries/zip.html
  */
 class CI_Zip  {
 
diff --git a/system/plugins/captcha_pi.php b/system/plugins/captcha_pi.php
index 7e6a35f..11d4564 100644
--- a/system/plugins/captcha_pi.php
+++ b/system/plugins/captcha_pi.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
diff --git a/system/plugins/js_calendar_pi.php b/system/plugins/js_calendar_pi.php
index a2259d6..86270ca 100644
--- a/system/plugins/js_calendar_pi.php
+++ b/system/plugins/js_calendar_pi.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
diff --git a/system/scaffolding/Scaffolding.php b/system/scaffolding/Scaffolding.php
index bffc0ec..a977704 100644
--- a/system/scaffolding/Scaffolding.php
+++ b/system/scaffolding/Scaffolding.php
@@ -7,8 +7,8 @@
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2006, EllisLab, Inc.
- * @license		http://www.codeigniter.com/user_guide/license.html
- * @link		http://www.codeigniter.com
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
  * @since		Version 1.0
  * @filesource
  */
@@ -23,7 +23,7 @@
  * @package		CodeIgniter
  * @subpackage	Scaffolding
  * @author		ExpressionEngine Dev Team
- * @link		http://www.codeigniter.com/user_guide/general/scaffolding.html
+ * @link		http://codeigniter.com/user_guide/general/scaffolding.html
  */
 class Scaffolding {
 
diff --git a/system/scaffolding/views/footer.php b/system/scaffolding/views/footer.php
index d25365d..a287664 100644
--- a/system/scaffolding/views/footer.php
+++ b/system/scaffolding/views/footer.php
@@ -2,7 +2,7 @@
 </div>
 
 <div id="footer">
-<p><a href="http://www.codeigniter.com/">CodeIgniter</a>, by <a href="http://www.EllisLab.com">EllisLab</a> -  Version <?php echo CI_VERSION ?></p>
+<p><a href="http://codeigniter.com/">CodeIgniter</a>, by <a href="http://www.EllisLab.com">EllisLab</a> -  Version <?php echo CI_VERSION ?></p>
 <p>Page rendered in {elapsed_time}</p>
 </div>